From fbebb232db61324e89406a27bc914ace62c68e79 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Tue, 22 Nov 2005 10:01:03 +0000 Subject: [PATCH] Add quartz backend. 2005-11-21 Anders Carlsson * configure.in: * gtk/Makefile.am: * gdk/Makefile.am: * gdk/quartz/*: Add quartz backend. * docs/tools/Makefile.am: Only build docshooter when the X11 backend is used. * gtk/gtkplug-stub.c: Include gtkplug.h here. * gtk/gtksocket-stub.c: Include gtksocket.h here. --- ChangeLog | 18 ++++++++++++++++++ ChangeLog.pre-2-10 | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/ChangeLog b/ChangeLog index 94011d9dac..a71cfecf5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2005-11-21 Anders Carlsson + + * configure.in: + * gtk/Makefile.am: + * gdk/Makefile.am: + * gdk/quartz/*: + Add quartz backend. + + * docs/tools/Makefile.am: + Only build docshooter when the X11 backend is used. + + * gtk/gtkplug-stub.c: + Include gtkplug.h here. + + * gtk/gtksocket-stub.c: + Include gtksocket.h here. + 2005-11-21 Matthias Clasen * gtk/gtksocket.c: Convert GtkSocket to g_type_class_add_private. @@ -21,6 +38,7 @@ (gtk_combo_box_child_show, gtk_combo_box_child_hide): Use g_signal_emit, not g_signal_emit_by_name. +>>>>>>> 1.7265 2005-11-18 Matthias Clasen Fix crashes in connection with pathbar scrolling (#321560, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 94011d9dac..a71cfecf5f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,20 @@ +2005-11-21 Anders Carlsson + + * configure.in: + * gtk/Makefile.am: + * gdk/Makefile.am: + * gdk/quartz/*: + Add quartz backend. + + * docs/tools/Makefile.am: + Only build docshooter when the X11 backend is used. + + * gtk/gtkplug-stub.c: + Include gtkplug.h here. + + * gtk/gtksocket-stub.c: + Include gtksocket.h here. + 2005-11-21 Matthias Clasen * gtk/gtksocket.c: Convert GtkSocket to g_type_class_add_private. @@ -21,6 +38,7 @@ (gtk_combo_box_child_show, gtk_combo_box_child_hide): Use g_signal_emit, not g_signal_emit_by_name. +>>>>>>> 1.7265 2005-11-18 Matthias Clasen Fix crashes in connection with pathbar scrolling (#321560, -- 2.30.2